Skip to content

[FW][I18N] *: export 15.0 translations #7447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

[FW][I18N] *: export 15.0 translations #7447

wants to merge 1 commit into from

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jan 19, 2024

Forward-Port-Of: #7446
Forward-Port-Of: #7435

@robodoo
Copy link
Collaborator

robodoo commented Jan 19, 2024

Pull request status dashboard.

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 19, 2024

@mart-e cherrypicking of pull request #7435 failed.

stdout:

Auto-merging locale/sources/administration.pot
CONFLICT (content): Merge conflict in locale/sources/administration.pot
Auto-merging locale/sources/developer.pot
CONFLICT (content): Merge conflict in locale/sources/developer.pot
Auto-merging locale/sources/finance.pot
CONFLICT (content): Merge conflict in locale/sources/finance.pot
Auto-merging locale/sources/general.pot
CONFLICT (content): Merge conflict in locale/sources/general.pot
Auto-merging locale/sources/hr.pot
CONFLICT (content): Merge conflict in locale/sources/hr.pot
Auto-merging locale/sources/inventory_and_mrp.pot
CONFLICT (content): Merge conflict in locale/sources/inventory_and_mrp.pot
Auto-merging locale/sources/legal.pot
CONFLICT (content): Merge conflict in locale/sources/legal.pot
Auto-merging locale/sources/marketing.pot
CONFLICT (content): Merge conflict in locale/sources/marketing.pot
Auto-merging locale/sources/productivity.pot
CONFLICT (content): Merge conflict in locale/sources/productivity.pot
Auto-merging locale/sources/sales.pot
CONFLICT (content): Merge conflict in locale/sources/sales.pot
Auto-merging locale/sources/services.pot
CONFLICT (content): Merge conflict in locale/sources/services.pot
Auto-merging locale/sources/websites.pot
CONFLICT (content): Merge conflict in locale/sources/websites.pot

stderr:

11:27:58.765644 git.c:463               trace: built-in: git cherry-pick dc60512df4fb2dd5588ad0ef380dcf87e76f1898
error: could not apply dc60512df... [I18N] *: export 16.0 translations
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@mart-e mart-e force-pushed the saas-16.1-15.0-i18n-export-mat-jGnM-fw branch from 613613a to dac8128 Compare January 19, 2024 10:31
@mart-e
Copy link
Contributor

mart-e commented Jan 19, 2024

robodoo r+

robodoo pushed a commit that referenced this pull request Jan 19, 2024
@mart-e
[I18N] *: export 16.0 translations
3917094 
closes #7447

X-original-commit: 786df1f
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
@robodoo robodoo closed this Jan 19, 2024
This was referenced Jan 19, 2024
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflict forwardport

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fw-bot @robodoo @mart-e